Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Sat, 16 Jun 2007 22:33:42 +0000 (22:33 +0000)
committerMiles Bader <miles@gnu.org>
Sat, 16 Jun 2007 22:33:42 +0000 (22:33 +0000)
commit53697e72c2cfe2f2f5594352af2730bfd13ef869
tree6f20dfd0d199aaa766c543d94140d87aa6c84db3
parent4554c39c51d9c541f9f0b6dc6e20c42fa06e5075
parentc2ea70fb8229c20024b0a557248f6b6d4b8744d4
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 793-802)

   - Update from CVS
   - Remove RCS keywords
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 42-50)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * gnus--rel--5.10  (patch 229-232)

   - Merge from emacs--devo--0, emacs--rel--22
   - ChangeLog tweak
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
26 files changed:
configure
configure.in
lisp/font-lock.el
lisp/gnus/ChangeLog.2
lisp/mb-depth.el
lisp/server.el
lisp/startup.el
lisp/subr.el
lisp/term/mac-win.el
lisp/term/x-win.el
lisp/term/xterm.el
lisp/x-dnd.el
src/config.in
src/dispextern.h
src/frame.h
src/image.c
src/macfns.c
src/macmenu.c
src/macterm.c
src/macterm.h
src/term.c
src/w32.c
src/w32menu.c
src/xdisp.c
src/xfns.c
src/xmenu.c